Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Wed, 2 Jun 2010 11:55:37 +0000 (11:55 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Wed, 2 Jun 2010 11:55:37 +0000 (11:55 +0000)
commit15e33dbbb2c645956c62c2ec438c976dd3aa3fad
tree12dc555ce88205d0aca5f83f023d441843d5da80
parent5855f65345808c24bc079fbe448cb366af96db39
parentd93fd27723b96d692a52cf025e6f85851fd71c16
Merge from mainline.